]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
Revert "shell/app: Do not try to activate OR windows"
authorFlorian Müllner <fmuellner@gnome.org>
Sun, 20 Mar 2022 18:15:58 +0000 (19:15 +0100)
committerMarge Bot <marge-bot@gnome.org>
Mon, 28 Mar 2022 15:54:33 +0000 (15:54 +0000)
Now that shell_app_get_windows() itself filters out OR windows, this is
no longer needed.

This reverts commit f9037f5889801c80d15ee3dc45c9a9f8cc57feba.

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5233

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2252>

src/shell-app.c

index 15109713877b07c326b76e90a71c4d7f1e182536..96fe31bff33365001fb854ec9f2e941d73a2af2a 100644 (file)
@@ -428,19 +428,8 @@ shell_app_activate_window (ShellApp     *app,
     return;
 
   windows = shell_app_get_windows (app);
-  if (window == NULL)
-    {
-      for (GSList *l = windows; l; l = l->next)
-        {
-          MetaWindow *current_window = l->data;
-
-          if (!meta_window_is_override_redirect (current_window))
-            {
-              window = current_window;
-              break;
-            }
-        }
-    }
+  if (window == NULL && windows)
+    window = windows->data;
 
   if (!g_slist_find (windows, window))
     return;
@@ -469,9 +458,7 @@ shell_app_activate_window (ShellApp     *app,
         {
           MetaWindow *other_window = iter->data;
 
-          if (other_window != window &&
-              !meta_window_is_override_redirect (other_window) &&
-              meta_window_get_workspace (other_window) == workspace)
+          if (other_window != window && meta_window_get_workspace (other_window) == workspace)
             meta_window_raise (other_window);
         }
       g_slist_free (windows_reversed);